From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 25 Oct 2010 03:06:35 +0000 (+0900)
Subject: Add alternative key bindings for epa-mail commands.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5950
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8072ebf23a9c0018dbc165cdf1641b6d4c3b495b;p=emacs.git

Add alternative key bindings for epa-mail commands.

* epa.texi (Mail-mode integration): Add alternative key bindings
for epa-mail commands; escape comma.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 52de55ba7ef..0cfb930656d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-25  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa.texi (Mail-mode integration): Add alternative key bindings
+	for epa-mail commands; escape comma.
+
 2010-10-24  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc.texi:  Use emacsver.texi to determine Emacs version.
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 32bf9e7fe1d..dd7468959f4 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -313,7 +313,7 @@ inside a message body, not using modern MIME format.
 NOTE: Inline PGP is not recommended and you should consider to use
 PGP/MIME.  See
 @uref{http://josefsson.org/inline-openpgp-considered-harmful.html,
-Inline PGP in E-mail is bad, Mm'kay?}.
+Inline PGP in E-mail is bad@comma{} Mm'kay?}.
 
 @noindent
 Once @code{epa-mail-mode} is enabled, the following keys are assigned.
@@ -321,22 +321,26 @@ You can do it by @kbd{C-u 1 M-x epa-mail-mode} or through the Customize
 interface.  Try @kbd{M-x customize-variable epa-global-mail-mode}.
 
 @table @kbd
-@item C-c C-e d
+@item C-c C-e C-d and C-c C-e d
+@kindex @kbd{C-c C-e C-d}
 @kindex @kbd{C-c C-e d}
 @findex epa-mail-decrypt
 Decrypt OpenPGP armors in the current buffer.
 
-@item C-c C-e v
+@item C-c C-e C-v and C-c C-e v
+@kindex @kbd{C-c C-e C-v}
 @kindex @kbd{C-c C-e v}
 @findex epa-mail-verify
 Verify OpenPGP cleartext signed messages in the current buffer.
 
-@item C-c C-e s
+@item C-c C-e C-s and C-c C-e s
+@kindex @kbd{C-c C-e C-s}
 @kindex @kbd{C-c C-e s}
 @findex epa-mail-sign
 Compose a signed message from the current buffer.
 
-@item C-c C-e e
+@item C-c C-e C-e and C-c C-e e
+@kindex @kbd{C-c C-e C-e}
 @kindex @kbd{C-c C-e e}
 @findex epa-mail-encrypt
 Compose an encrypted message from the current buffer.